Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[smart_holder] Fix git merge accident (pybind11/detail/descr.h). #5086

Merged
merged 1 commit into from
Apr 2, 2024

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Apr 2, 2024

Description

This was noticed only when manually reviewing the diffs with the Google review tools.

Suggested changelog entry:

This was noticed only when manually reviewing the diffs with the Google review tools.
@rwgk rwgk merged commit cfe7356 into pybind:smart_holder Apr 2, 2024
118 of 152 checks passed
@rwgk rwgk deleted the sh_fix_merge_accident branch April 2, 2024 18:11
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Apr 2, 2024
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Apr 2, 2024
@rwgk
Copy link
Collaborator Author

rwgk commented Apr 2, 2024

The CI failures are unrelated. See #3939.

rwgk pushed a commit to rwgk/pybind11 that referenced this pull request Jun 12, 2024
* Fix merge accident in pybind11/detail/descr.h (pybind#5086)

This was noticed only when manually reviewing the diffs with the Google review tools.

* Fix typo in changelog date (pybind#5096)

This was actually released in 2024!

* ci: macos-latest is changing to macos-14 ARM runners (pybind#5109)

Committed via https://github.com/asottile/all-repos

* chore: docs and nox bump (pybind#5071)

Signed-off-by: Henry Schreiner <[email protected]>

* docs(numpy): drop duplicated ndim (pybind#5119)

* chore(deps): bump idna from 3.6 to 3.7 in /docs (pybind#5121)

Bumps [idna](https://github.com/kjd/idna) from 3.6 to 3.7.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v3.6...v3.7)

---
updated-dependencies:
- dependency-name: idna
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump jinja2 from 3.1.3 to 3.1.4 in /docs (pybind#5122)

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump the actions group with 1 update (pybind#5082)

* chore(deps): bump the actions group with 1 update

Bumps the actions group with 1 update: [actions/labeler](https://github.com/actions/labeler).


Updates `actions/labeler` from 4 to 5
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](actions/labeler@v4...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
...

Signed-off-by: dependabot[bot] <[email protected]>

* ci: fix labeler

Signed-off-by: Henry Schreiner <[email protected]>

* ci: move eigen to 64-bit only

Signed-off-by: Henry Schreiner <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <[email protected]>

* chore(deps): update pre-commit hooks (pybind#5123)

* chore(deps): update pre-commit hooks

updates:
- [github.com/pre-commit/mirrors-clang-format: v18.1.2 → v18.1.4](pre-commit/mirrors-clang-format@v18.1.2...v18.1.4)
- [github.com/astral-sh/ruff-pre-commit: v0.3.5 → v0.4.3](astral-sh/ruff-pre-commit@v0.3.5...v0.4.3)
- [github.com/pre-commit/mirrors-mypy: v1.9.0 → v1.10.0](pre-commit/mirrors-mypy@v1.9.0...v1.10.0)
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0)
- [github.com/python-jsonschema/check-jsonschema: 0.28.1 → 0.28.2](python-jsonschema/check-jsonschema@0.28.1...0.28.2)

* style: pre-commit fixes

* Update .pre-commit-config.yaml

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <[email protected]>

* --- (pybind#5130)

updated-dependencies:
- dependency-name: requests
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: support Python 3.13.0b1 (PEP 667 fix) (pybind#5127)

* ci: add Python 3.13

Signed-off-by: Henry Schreiner <[email protected]>

* tests: run the gc for 3.13+

Signed-off-by: Henry Schreiner <[email protected]>

* Revert "tests: run the gc for 3.13+"

This reverts commit fe8a3ce.

* ci: drop macos ARM for now, need pin updates

Signed-off-by: Henry Schreiner <[email protected]>

* fix: use Python 3.13 API if on 3.13

Signed-off-by: Henry Schreiner <[email protected]>

---------

Signed-off-by: Henry Schreiner <[email protected]>

* chore: some cleanup (pybind#5137)

* Tracking ci.yml changes from master.

---------

Signed-off-by: Henry Schreiner <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Tim Stumbaugh <[email protected]>
Co-authored-by: Henry Schreiner <[email protected]>
Co-authored-by: nobkd <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant